Skip to content

feat: allow extra env vars for addons#1065

Open
smasset-orange wants to merge 2 commits into
clastix:masterfrom
smasset-orange:feature/addons-extra-env
Open

feat: allow extra env vars for addons#1065
smasset-orange wants to merge 2 commits into
clastix:masterfrom
smasset-orange:feature/addons-extra-env

Conversation

@smasset-orange

@smasset-orange smasset-orange commented Jan 26, 2026 •
edited
Loading

Copy link
Copy Markdown

Adds extraEnvs to all current addon specs to allow setting extra envvars to the addon's containers.

My main use case is setting KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to allow CoreDNS and konnectivity-agent to start on Tenant cluster nodes when Kamaji is running behind external LB.

@netlify

netlify Bot commented Jan 26, 2026 •
edited
Loading

Copy link
Copy Markdown

✅ Deploy Preview for kamaji-documentation canceled.

Name Link
🔨 Latest commit 6fcbfe8
🔍 Latest deploy log https://app.netlify.com/projects/kamaji-documentation/deploys/698477c4e3207c00086b924b

@smasset-orange smasset-orange changed the title Addons extra env vars feat: allow extra env vars for addons Jan 26, 2026
@prometherion

prometherion commented Jan 26, 2026

Copy link
Copy Markdown
Member

@smasset-orange we can accept this contribution, let's focus on getting CI green tho.

prometherion
prometherion requested changes Jan 26, 2026
View reviewed changes
Comment thread api/v1alpha1/tenantcontrolplane_types.go Outdated
@smasset-orange smasset-orange force-pushed the feature/addons-extra-env branch from 7987d5b to 44c3ace Compare January 26, 2026 22:41
@smasset-orange

smasset-orange commented Jan 26, 2026

Copy link
Copy Markdown
Author

@smasset-orange we can accept this contribution, let's focus on getting CI green tho.

Removed commit with changes to e2e Makefile target for now.
Not sure yet why CI pipeline wasn't starting kind cluster with e2e-setup as a dependency for e2e but I'll check that later

@smasset-orange

smasset-orange commented Jan 26, 2026

Copy link
Copy Markdown
Author

@smasset-orange we can accept this contribution, let's focus on getting CI green tho.

Removed commit with changes to e2e Makefile target for now. Not sure yet why CI pipeline wasn't starting kind cluster with e2e-setup as a dependency for e2e but I'll check that later

I think I've found it...

@smasset-orange smasset-orange force-pushed the feature/addons-extra-env branch from 2027544 to 812d494 Compare January 27, 2026 00:44
@smasset-orange

smasset-orange commented Jan 27, 2026 •
edited
Loading

Copy link
Copy Markdown
Author

FYI, local e2e tests results :

Summarizing 3 Failures:
  [FAIL] starting a kind worker with kubeadm [It] should join the Tenant Control Plane cluster
  /workspaces/kamaji/e2e/worker_kubeadm_join_test.go:185
  [FAIL] When migrating a Tenant Control Plane to another datastore (postgresql) [It] Should contain all the migrated data
  /workspaces/kamaji/e2e/tcp_migration_test.go:86
  [FAIL] When migrating a Tenant Control Plane to another datastore (etcd) [It] Should contain all the migrated data
  /workspaces/kamaji/e2e/tcp_migration_test.go:86

Ran 30 of 30 Specs in 866.236 seconds
FAIL! -- 27 Passed | 3 Failed | 0 Pending | 0 Skipped

Tests in tcp_migration_test.go are failing because I'm running all of this from a dev container and can't handle randomly selected network profile ports and redirect them to the docker host using extraPortMappings in kind config.

Pretty much the same with the test in worker_kubeadm_join_test.go as I can't segregate the test containers from kind cluster create from the Makefile.

I'm confident they'll pass when run from the CI though.

@smasset-orange smasset-orange force-pushed the feature/addons-extra-env branch from 812d494 to 4b067ee Compare January 27, 2026 10:38
@smasset-orange

smasset-orange commented Jan 27, 2026 •
edited
Loading

Copy link
Copy Markdown
Author

Tests are passing. Pushed missing changes to API doc.

@prometherion

prometherion commented Jan 27, 2026

Copy link
Copy Markdown
Member

Let's see the CI, as I said, we can get this merged.

I've tried to reach out to you privately using your email address since I'm a bit puzzled by your use-case, such as overriding environment variables. It would be great if we could connect.

@smasset-orange

smasset-orange commented Jan 27, 2026

Copy link
Copy Markdown
Author

Missed your private email. Will reply later today.

@smasset-orange

smasset-orange commented Jan 30, 2026

Copy link
Copy Markdown
Author

Successfully tested on CoreDNS addon after publishing image and Helm chart to local repositories.
@prometherion anything missing (beside your review) to merge this ?

@smasset-orange smasset-orange force-pushed the feature/addons-extra-env branch from 4b067ee to ac4bb2f Compare February 2, 2026 08:46
@smasset-orange

smasset-orange commented Feb 2, 2026

Copy link
Copy Markdown
Author

Rebased against latest changes on master branch

@smasset-orange smasset-orange force-pushed the feature/addons-extra-env branch from ac4bb2f to 5b6a542 Compare February 3, 2026 16:38
@smasset-orange
feat(addons): add extraEnvs field to addons to add envvars to containers
4f8871f 
Signed-off-by: Sébastien Masset <86793256+smasset-orange@users.noreply.github.com>
@smasset-orange
feat(e2e): split e2e Make task to make local testing faster
6fcbfe8 
Signed-off-by: Sébastien Masset <86793256+smasset-orange@users.noreply.github.com>
@smasset-orange smasset-orange force-pushed the feature/addons-extra-env branch from 5b6a542 to 6fcbfe8 Compare February 5, 2026 10:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@prometherion prometherion Awaiting requested review from prometherion

Requested changes must be addressed to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@smasset-orange @prometherion